Resolving Git Merge Conflicts With Github Labs